From: kfraser@localhost.localdomain Date: Thu, 29 Mar 2007 22:31:58 +0000 (+0100) Subject: xend: Fix shutdown method after PV-on-HVM save/restore patch. X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=76b2ca09df529940e080d8969a8a8d99b8300cd0;p=xen.git xend: Fix shutdown method after PV-on-HVM save/restore patch. Signed-off-by: Keir Fraser --- diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 3fdba4d8f2..7ba20fb566 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -448,14 +448,13 @@ class XendDomainInfo: self._removeVm('xend/previous_restart_time') self.storeDom("control/shutdown", reason) - ## HVM domain shutdown itself if has PV driver, - ## otherwise remote shutdown it - hvm_pvdrv = xc.hvm_get_param(self.domid, HVM_PARAM_CALLBACK_IRQ) - if self.info.is_hvm() and not hvm_pvdrv: - code = REVERSE_DOMAIN_SHUTDOWN_REASONS[reason] - log.info("HVM save:remote shutdown dom %d!", self.domid) - xc.domain_shutdown(self.domid, code) - + # HVM domain shuts itself down only if it has PV drivers + if self.info.is_hvm(): + hvm_pvdrv = xc.hvm_get_param(self.domid, HVM_PARAM_CALLBACK_IRQ) + if not hvm_pvdrv: + code = REVERSE_DOMAIN_SHUTDOWN_REASONS[reason] + log.info("HVM save:remote shutdown dom %d!", self.domid) + xc.domain_shutdown(self.domid, code) def pause(self): """Pause domain